Remove dependence on <ciso646> #73273
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-debuginfo @llvm/pr-subscribers-llvm-support Author: Michael Kenzel (michael-kenzel) ChangesC++23 removed Full diff: https://github.com/llvm/llvm-project/pull/73273.diff 2 Files Affected:
diff --git a/llvm/include/llvm/Support/Threading.h b/llvm/include/llvm/Support/Threading.h
index ba6c531ab4db214..e83cb67ac1cab47 100644
--- a/llvm/include/llvm/Support/Threading.h
+++ b/llvm/include/llvm/Support/Threading.h
@@ -18,7 +18,7 @@
#include "llvm/ADT/StringRef.h"
#include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX
#include "llvm/Support/Compiler.h"
-#include <ciso646> // So we can check the C++ standard lib macros.
+#include <version>
#include <optional>
#if defined(_MSC_VER)
diff --git a/llvm/lib/DebugInfo/GSYM/LookupResult.cpp b/llvm/lib/DebugInfo/GSYM/LookupResult.cpp
index 00a5b1bbfaa5fba..0a09feefbd7503f 100644
--- a/llvm/lib/DebugInfo/GSYM/LookupResult.cpp
+++ b/llvm/lib/DebugInfo/GSYM/LookupResult.cpp
@@ -12,7 +12,6 @@
#include "llvm/Support/Format.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/raw_ostream.h"
-#include <ciso646>
using namespace llvm;
using namespace gsym;
|
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
michael-kenzel
force-pushed
the
remove-ciso646
branch
from
d2b2d84 to
230d03c
Compare
|
Is there a reason why this never got merged? |
JDevlieghere
approved these changes
Feb 9, 2025
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/204/builds/332 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/140/builds/16588 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/145/builds/5017 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/95/builds/9402 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/76/builds/6831 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/129/builds/14488 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/134/builds/13171 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/168/builds/8517 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/72/builds/8042 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/157/builds/19538 Here is the relevant piece of the build log for the reference |
JDevlieghere
added a commit
that referenced
this pull request
Feb 9, 2025
This reverts commit c89735d.
JDevlieghere
added a commit
that referenced
this pull request
Feb 9, 2025
|
LLVM builds with C++17 and the new |
github-actions bot
pushed a commit
to arm/arm-toolchain
that referenced
this pull request
Feb 9, 2025
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/161/builds/4607 Here is the relevant piece of the build log for the reference |
Icohedron
pushed a commit
to Icohedron/llvm-project
that referenced
this pull request
Feb 11, 2025
C++23 removed `<ciso646>` from the standard library. The header is used in two places: Once in order to pull in standard library macros. Since this file also includes `<optional>`, that use of `<ciso646>` is technically redundant, but should probably be left in in case a future change ever removes the include of `<optional>`. A second use of `<ciso646>` appears to have been introduced in da65009, but seems unnecessary (the file doesn't seem to use anything from that header, and it seems to build just fine on MSVC here without it). The new `<version>` header should be supported by all supported implementations. This change replaces uses of `<ciso646>` with the `<version>` header, or removes them entirely where unnecessary.
Icohedron
pushed a commit
to Icohedron/llvm-project
that referenced
this pull request
Feb 11, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
C++23 removed
<ciso646>from the standard library. The header is used in two places: Once in order to pull in standard library macros. Since this file also includes<optional>, that use of<ciso646>is technically redundant, but should probably be left in in case a future change ever removes the include of<optional>. A second use of<ciso646>appears to have been introduced in da65009, but seems unnecessary (the file doesn't seem to use anything from that header, and it seems to build just fine on MSVC here without it). The new<version>header should be supported by all supported implementations. This change replaces uses of<ciso646>with the<version>header, or removes them entirely where unnecessary.